Merge git://git.denx.de/u-boot-dm
authorTom Rini <[email protected]>
Thu, 21 Jan 2016 16:49:49 +0000 (11:49 -0500)
committerTom Rini <[email protected]>
Thu, 21 Jan 2016 16:49:49 +0000 (11:49 -0500)

Trivial merge